merge trunk
authorK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:26:04 +0000 (23:26 +0900)
committerK. Handa <handa@gnu.org>
Wed, 12 Jun 2013 14:26:04 +0000 (23:26 +0900)

Trivial merge